Add traceID if possible when using context logger. #2518
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Need rebase on #2521 once merged. |
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
|
I've pushed a commit to rebase |
pracucci
force-pushed
the
logger-context
branch
from
7671211
to
8c39552
Compare
pracucci
approved these changes
Apr 24, 2020
| @@ -127,7 +129,7 @@ func WithUserID(userID string, l log.Logger) log.Logger { | |||
| // its details. | |||
| func WithTraceID(traceID string, l log.Logger) log.Logger { | |||
| // See note in WithContext. | |||
| return log.With(l, "trace_id", traceID) | |||
| return log.With(l, "traceID", traceID) | |||
There was a problem hiding this comment.
I'm also renaming span_id to spanID because we have inconsistency with weaveworks server which uses spanID.
Note to myself: I guess you meant traceID and not spanID.
pkg/util/log.go
Outdated
Comment on lines
106
to
111
| if err != nil { | ||
| if err != nil && err != user.ErrNoOrgID { | ||
| return l | ||
| } | ||
| l = WithUserID(userID, l) | ||
| if err == nil { | ||
| l = WithUserID(userID, l) | ||
| } |
There was a problem hiding this comment.
Can't we simplify it as the following, so that the trace ID is injected in any case?
if err == nil {
l = WithUserID(userID, l)
}
For reference: |
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
pstibrany
approved these changes
Apr 24, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change the behaviour of the context logger, there is situation where we don't have an org_id and we would still want to log with the spanID.
I'm also renaming
span_idtospanIDbecause we have inconsistency with weaveworks server which usesspanID. Wasn't sure if this would be welcomed change in weaveworks but I'm can send the PR there.Signed-off-by: Cyril Tovena cyril.tovena@gmail.com